Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 21:42:30 +0000 (13:42 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 21:42:30 +0000 (13:42 -0800)

Trivial merge